Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 1 Apr 2010 06:50:44 +0000 (08:50 +0200)
committerJan D. <jan.h.d@swipnet.se>
Thu, 1 Apr 2010 06:50:44 +0000 (08:50 +0200)
commitf0c13927b00846351c42afcab5c2a44d4a222f20
tree3f43987f7de3f0628f28ee5c54cb12011dd4fed6
parent74b902fae3b20a9980f231736a479fa3bea42d7f
parentcb2b1368e91c829f6e91b97f77734a7e843d120c
Merge from trunk